From 356ea64599b7bc49f570d747f3fcee8cb7768d99 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Sat, 13 Aug 2011 10:12:49 +0100 Subject: [PATCH] VT-d: don't reject valid DMAR/ATSR tables on systems with multiple PCI segments On multi-PCI-segment systems, each segment has to be expected to have an include-all DRHD and an all-ports ATSR, so the firmware consistency check incorrectly rejects valid configurations there (which is particularly problematic when the firmware also pre-enabled x2apic mode, as the system will panic in that case due to being unable to enable interrupt remapping). Thus constrain the check to just segment 0 for now; once full multi-segment support is there (which I'm working on), it can be revisited whether we'd want to track this per segment, or whether we trust the firmware of such large systems. Signed-off-by: Jan Beulich --- xen/drivers/passthrough/vtd/dmar.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/vtd/dmar.c b/xen/drivers/passthrough/vtd/dmar.c index 26e1305954..34d91990bf 100644 --- a/xen/drivers/passthrough/vtd/dmar.c +++ b/xen/drivers/passthrough/vtd/dmar.c @@ -418,13 +418,14 @@ acpi_parse_one_drhd(struct acpi_dmar_entry_header *header) if ( iommu_verbose ) dprintk(VTDPREFIX, " flags: INCLUDE_ALL\n"); /* Only allow one INCLUDE_ALL */ - if ( include_all ) + if ( drhd->segment == 0 && include_all ) { dprintk(XENLOG_WARNING VTDPREFIX, "Only one INCLUDE_ALL device scope is allowed\n"); ret = -EINVAL; } - include_all = 1; + if ( drhd->segment == 0 ) + include_all = 1; } if ( ret ) @@ -624,13 +625,14 @@ acpi_parse_one_atsr(struct acpi_dmar_entry_header *header) if ( iommu_verbose ) dprintk(VTDPREFIX, " flags: ALL_PORTS\n"); /* Only allow one ALL_PORTS */ - if ( all_ports ) + if ( atsr->segment == 0 && all_ports ) { dprintk(XENLOG_WARNING VTDPREFIX, "Only one ALL_PORTS device scope is allowed\n"); ret = -EINVAL; } - all_ports = 1; + if ( atsr->segment == 0 ) + all_ports = 1; } if ( ret ) -- 2.30.2